bugfix
bugfix
with turning into state-exchange
refactorings...