Update based on comments by Vijay.