Adding the latest changes.