changes kindly suggested by hound