refactoring update on 2014/08/31