Rejig and comment