Made changes as per discussed with Dax and Rob