standalonify a bit