changed to correct current_user implementation