Added sort and fixed shuffle