furthe tweaks for reliability