new, clean, palantir-less version