changesOct092014

not final yet