Checked in by Rudy for Updating to the newest version