Revert "Revert "Improvements on the same day""

This reverts commit 38382e39b79e12e541d9c71ee757c4c8815553a1.