Applied comments from @dbu