Integrated changes suggested by virup