Changed underlying drawing functions