Updated to draw pictures correctly