Applying washort's comments