updated code for current user