Added a None option for sorting