Changes for new idea