diff --git a/background.js b/background.js
index 3db7431..8c66509 100644
--- a/background.js
+++ b/background.js
@@ -1,88 +1,35 @@
 chrome.commands.onCommand.addListener(function (command) {
-  if (command.match("account-[0-9]") ) {
+  if (command.match("account-[0-9]")) {
     chrome.tabs.query({ active: true, lastFocusedWindow: true }, tabs => {
-    
       var current_url = tabs[0].url;
       var account_num = command.substring(command.length - 1);
-      var update_url_regex = null;
-      var update_acc = null;
-
-      // Gmail
-      const gmail_regex = "https:\/\/mail.google.com\/mail\/u\/[0-9].*";
-      if (current_url.match(gmail_regex)) {
-        update_url_regex = RegExp("u\/[0-9]");
-        update_acc = "u/" + account_num
-      }
-
-      // Google Doc 
-      const doc_regex = "https:\/\/docs.google.com\/document\/u\/[0-9].*";
-      if (current_url.match(doc_regex)) {
-        update_url_regex = RegExp("u\/[0-9]");
-        update_acc = "u/" + account_num
-      }
-
-      // Google Drive 
-      const drive_regex = "https:\/\/drive.google.com\/drive\/u\/[0-9].*";
-      if (current_url.match(drive_regex)) {
-        update_url_regex = RegExp("u\/[0-9]");
-        update_acc = "u/" + account_num
-      }
-
-      // Google Play Music 
-      const play_music_regex = "https:\/\/play.google.com\/music\/listen\\?u\=[0-9].*";
-      if (current_url.match(play_music_regex)) {
-        update_url_regex = RegExp("\\?u\=[0-9]");
-        update_acc = "?u=" + account_num
-      }
-      
-      // Google Classroom
-      const classroom_regex = "https:\/\/classroom.google.com\/u\/[0-9].*";
-      if (current_url.match(classroom_regex)) {
-        update_url_regex = RegExp("u\/[0-9]");
-        update_acc = "u/" + account_num
-      }
-
-      // Google Meet
-      const meet_regex = "https:\/\/meet.google.com\/.*\?authuser=[0-9].*";
-      if (current_url.match(meet_regex)) {
-        update_url_regex = RegExp("authuser=[0-9]");
-        update_acc = "authuser=" + account_num
+      var possible_regex = ["u/", "u=", "authuser=", "b/"]
+      // var mapping = {"u/":[], "u=", "authuser="}
+
+      const google_regex = "https:\/\/.+.google.com.*"
+      if (current_url.match(google_regex)) {
+        let updated = false
+        for (let i = 0; i < possible_regex.length; i++) {
+          let curRegex = possible_regex[i]
+          if (current_url.search(curRegex + "[0-9]") >= 0) {
+            current_url = current_url.replace(RegExp(curRegex + "[0-9]"), curRegex + account_num);
+            chrome.tabs.update({ url: current_url });
+            updated = true
+            break;
+          }
+        }
+        if (!updated) {
+          if (current_url.search("calendar.google.com") >= 0)
+            current_url = current_url.replace('/r', "/b/" + account_num + "/r");
+          else{
+            addition = (current_url[-1] == '/') ? "u/" : "/u/";
+            current_url = current_url + addition + account_num;
+          }
+          chrome.tabs.update({ url: current_url });
+        }
+      } else {
+        alert("Account switching is not supported on this page.")
       }
-
-      // Google Hangouts
-      const hangouts_regex = "https:\/\/hangouts.google.com\/.*\?authuser=[0-9].*";
-      console.log(current_url, hangouts_regex)
-      if (current_url.match(hangouts_regex)) {
-        update_url_regex = RegExp("authuser=[0-9]");
-        update_acc = "authuser=" + account_num
-      }
-
-      // Google Accounts
-      const accounts_regex = "https:\/\/myaccount.google.com\/u\/[0-9].*";
-      console.log(current_url, accounts_regex)
-      if (current_url.match(accounts_regex)) {
-        update_url_regex = RegExp("u\/[0-9]");
-        update_acc = "u/" + account_num
-      }
-
-      
-      // Google Duo web
-      const duo_regex = "https:\/\/duo.google.com\/u\/[0-9].*";
-      console.log(current_url, duo_regex)
-      if (current_url.match(duo_regex)) {
-        update_url_regex = RegExp("u\/[0-9]");
-        update_acc = "u/" + account_num
-      }
-
-      if (update_acc && update_url_regex) {
-        current_url = current_url.replace(update_url_regex, update_acc);
-        console.log(current_url)
-        chrome.tabs.update({ url: current_url });       
-      }
-      else {
-        console.log("Account switching is not supported on this page.")
-      }
-
     });
   }
 });