plan show deficiencies; major refactoring