Removed Hack and added other events