Updates to rules engine;