Latest edits for Hackathon demo