Merging for demo

May not be working properly!!!