Tweaks on disco end