5nov14 Refactor