12/18

some  changes