making state a macro
Making things good to TPV105