pre d3 and refactoring commit