2066: refactor cont...