continued re-jig
versioned