major update, to reduce dependency on the Imageset object