JengaScore - refactoring amd calls