Updated following further PR comments