Had to change rn methods to look for null