total rewrite of condition / test system