No longer attempt to be self-contained