Upgrades as per 06 spec