Improve physics of transitions