added current_user and other_user