added contexts to all the rules