final version for Griffith