Final changes before porting