updated after hackathon