Changes commited.
Sort function added, but removing conditions doesn't work.