Fixing and optimizing