re-added previous changing functionality