Updated after hackathon