Incorporate Marta's suggestions.