updated the other definitions with new definition for Exps and some restructuring.