Previous code improvement.