Moving to richardghirst version