modified users and current_user