Changes for image shapes