A couple changes as suggested by Ivan