adding events detection
adding menu
sorted out the menu bug
changed?
Merge branch 'localUpdates'
should be cleaned
should be cleaned