Fixed duping issues and concurrent substates