drawing
fixed merge conflicts