fixed use of Out instead of In + make_unique instead of new