Finished, and optimized