Updates based on Michael's feedback