completed draw, removed bug from contains