Modified code to reflect that changes merged in from the queue branch.