Made some changes in OoC and worked more on Tell