Buttons & Everyplay logic improved