Update to remove @NotNull annotation I tried