model and make fix
cleaning up expedite