02.19.14 refactoring