Part 4.2

Further Optimization