more changes to support user_info