Looks like a reasonable analysis and suggested solution.