Few changes and pushing out a dependency check