Changes based on danvk's review: