Refactor 0001, 0006