Why do we need this changes?