add ability to toggle MVP functionality only