More retooling for Compass UNFINISHED