Added tweaks for arduino