adding type
processing data
fixing ||=