Working on fixing null