State action improvements