DEMO JULY3 DONE! part 1 and 2