FINAL COMMIT FOR DEMO PART 1