Refactoring for the last experiment