address comments from @J_