moved current_user assignments around