removed hardcoded event