commit after  running-22jan2014, code is still buggy