Updated on comments from Nathan