Initial checking after refactor