Changed square to use Image