improved transitions2
smoothed transition
solved conflict