Lucia's changes