Debugged and optimized the new program structure.