Further hard work edit