Added drawing changes