more work, but at least it will function.