im a bit scared of changing behavior here and how things later on deal with null

going to make an alert and see