Updated to current version

Updated to what we had so far