Done moving. Query optimization is needed.