Fix rotation issue, remove disconnect