[Working] calculateRotation update
solve conflits