Start of porting to alpha 5