Updating so that we don’t pull state from server more than once