chnaged current_user method