Changed some values so I can do better null checking