taking into account @Danizord comments