Change orders and refactor a bit