Updated following project team review