checking progress before refactor