WIP soften more dependencies