Preparing for upgrade to window_step capability.