Now with the tidying merged in