make this happen earlier