started implementing better sorting features