Final version for the hackathon plus one