final set of changes to implement *current* design.