Before Player construction refactoring

save to avoid bugs