changes suggested by Amy toth