This was the old functionality? How's that notNull at all lol