Changed to Edward's design