refactor 31/10