some changes in progress - (iteration 1) - not stable!