Again some changes

Please merge it