Updated to match OSF integrated version