Added yellow circles and red rectangles that don't quite work