Applied Linda\'s changes