changes for MVP