Update to version from previous repository

Made sure to use the most current tools from existing repo.