removed .present? check on the name in favor of nil? || empty?