incorporated recommended improvements made by Shades