FIX use state and not status