update from emdek 20140703