Andrea minor changes to keep relevant