changes to adapt to mvp
changes to be able to commit