Added 'squared' option