EX-81 / Ex-84 changes

@cdodge here are the EX-81 & EX-84 changes. Kindly review them and share your feedback. 
Thanks