Added OnEnter/OnExit Events & fixed Timeline