New version post-hackathon