Added tween
Modified conflict