Added to drawing
Fixed merge conflicts