Optimized the code from tonight. There are 4 existing problems...