final tweaks for experimental