slight modifications in prep for v2