Some improvement in success window.