Added Griff's thing