updates from oct 2014, need to test