Update drawing
Fix conflicts
Fix switch