Added drawing code