Updated to latest TLC and state machine libs