reorganized file: using statelogic now