FINAL WORKING VERSION FOR DEMO