more refactoring incoming_controller, user_id