minor changes to adapt to mvp
temp-commit
commiting to merge