Continuing of porting to alpha 5