Further edits from Wayne