Updates by lvia