Adjusted shortcuts to latest from TVA