changed current_user method