All changes made for demo