have the solution in place, but need to test