added draw condition