Just need to test on lab apparatus - fix enumeration conflict?