Added drawing and combo