Changes according to TIU implementation
Implementation continued
Changes according to TIU implementation