tweaks based on rehearshing plus new link