more 2015 changes

more 2015 changes