2014.1.1 some modified