continue refactoring GRIFFIN