changes done to solve few bugs