added state changes, data folder