Run earlier, make frames explicit