Added some nice rectangles and a circle, NP