summer 2013 refactoring