Added sortable, improved versions