Added other handlers
fixed error