Version update to 3 following merge