06nov14 Refactoring