don't always re-create basecontent:
seems to work nicely since 41d9e5c8c0e7ad90a8bb475fa240a1df937d36c4