Implemented the EUG solution to CR 1084