Replaced some -- for -\/-