applied Fabien's recommendations