2014-12-18 updated things