Modified the block to work with 2.5 and removed the self check.
Removed tii classes