Changes from the hackathon :)