reviewed by Artem and updated following the review