Porting to new versions finished