Add greater availability check and sort better.