Incorporate Viktor's suggestions