Took @pyrech feedback into account