Updated based on comments in GH