handle status setup better