Added feature 25 changes