Fixed Edward's bugs