Removed update method
Fixed events