Incorporate feedback from Andrzej P.