Merged griff's project with mine