rework drawing
merge conflicts