Added draw, add and remove functions