Changes as recommended. Untested