Updates - Fixed issues

We were working on the same file, commit to fix this.
Update to fix issues