Actioned comments from Brandon Conway