Changing major instantiation to avoid null pointers.