Major update + sorting added