added more sorts and queue