the easy changes from wm4's comments