Added changes discovered at hackathon