porting more old functions in