Added Edward's changes