Updated idea
Merge branch 'update-idea'