Some changes that may eventually be tossed out