Various changes, rotation removed