refactoring code, updating TJCC