added CURRENT_USER & GET_USER_DATA method
merge the changes