reviewed some fixed done by yukti