merging in code that works on actual hardware