mvp customisation
refactor complete