Resolving comments from @dilvie