Fixed some bugs for demo - TEST TO MAKE SURE THINGS WORK CHANGE ITEMS