Improving states and completed status