Most of TLoI added