Make the old code better.