switched empty? to nil?