finished porting old methods to new object model