Update to bring in line with updates to Hackathon Starter