Added ability to toggle between clean data and custom data