Reverse Pull request

This pull request is to get all the modifications