Content Update

Updates described in commits