Added diagonal, and changed save names