Tweak for easier parallel development