renaming state as it does both