Tidying up this fork
More tweaking