- changed loading, can be done with null now