Change to place based sort