hard strategy working, but to upgrade.
some changes