Tides block: refactoring