Updated Griffin