Revamp future use.