Changes, make simpler.