Fixing and improving