separating check for property to a separate if block before checking if draft