Improved yesterday's changes