Restored events and logic
Merge pull request #53 from Folashade/sri

Restored events and logic