refact 2013-12-14