Made some changes (not compilable)