added draw conditions