Updated with new idea