Fix order to be more efficient