Delted things to make the switch to AVR easier