Former time trio phase 3 into rework

Published --