shades now correctly working