Added Fail Safes And Proper Event Setup