2.5; deprecated items updated