Incorporated off-thread review comments