Updated for AVR build