diggory's commit