A change from yesterday got reverted. Reimplementation