pre-MVP changes