trying to fix ordering