final version at the end of Hackathon