add new stuff for states and debugger