Patched up for production running. Tested.