Updated Shades + Formula