modified the rules a bit and commented out trace scenario. The latter is not used
updated and still needs some extra modifications