working on 2.5 changes