Adding a more fine status-based control.