update from origina 2014-12-12