Some minor changes
c2