adressing PR comments