Few changes for TBS Matrix system