Updated to the newest version of code