Abhijeet:Solve bugs