30 Dec 14 refactor