added a sapttering of unless nil?s