added all state feature