Updates based on feedback, PR#3