added state storage