Updated code/design for change methods.