10112014 1st refactoring