Refactor 12.v