added a bit of transitions