better transitions
merging with master