squashed my Arduino Branch