Commented out tweak for better sort logic, look in bubble-up