working changes for async updates