Taking into account comments from @electrical, PR4