big tidy up, move to v3