With dongle

Tested and working

Some scuffs