Making changes suggest by Pete L