Review code from @darraghmc updated by @grkvlt