Reverted to not sorting people