Revert "Improvements on the same day"

This reverts commit ef51d13128e011487f6dc7d8f6732be5701fa089.