Incremental changes. Transition still not flawless