New update, added Edward (sorry it took long, had no motivation)