Code brought up to date with Altis.