Added draw conditions & they work