fixed project with proper event handling
merged changes