Adjust for operation with new SPA