Made changes requested by hackcon organizers