Again some changes please include it

Please merge it