Added feature 25 changes

Can this be review please ?