Edward's changes