Porting from 1.4 or 1.4.1 to 2.0