Scuba project after refactoring