Revert "GREATER refactoring" because player suddenly died

This reverts commit 721dafa9f7659d6ed725d1cb48a312a4978ddfea.