refactor 0006 a littele