Updates based on Kevin's feedback