debug last commit + refactor