diff --git a/samples/react-faqs/src/webparts/faQs/FaQsWebPart.ts b/samples/react-faqs/src/webparts/faQs/FaQsWebPart.ts
index 9ab6ce321..3be774509 100644
--- a/samples/react-faqs/src/webparts/faQs/FaQsWebPart.ts
+++ b/samples/react-faqs/src/webparts/faQs/FaQsWebPart.ts
@@ -1,6 +1,7 @@
 import * as React from 'react';
 import * as ReactDom from 'react-dom';
-import { Version } from '@microsoft/sp-core-library';
+import { Version, Guid } from '@microsoft/sp-core-library';
+import { BrowserUtilities } from '@microsoft/sp-core-library/lib-commonjs/BrowserUtilities';
 
 import {
   BaseClientSideWebPart,
@@ -43,8 +44,9 @@ export default class FaqsWebPart extends BaseClientSideWebPart<IFaqsWebPartProps
     super();
 
     //Initialize unique GUID
-    this.guid = this.getGuid();
-    this.isMobile = this.detectmob();
+    this.guid = Guid.newGuid().toString();
+    this.isMobile = BrowserUtilities.isMobileBrowser();
+
     //Hack: to invoke correctly the onPropertyChange function outside this class
     //we need to bind this object on it first
     this.onPropertyPaneFieldChanged = this.onPropertyPaneFieldChanged.bind(this);
@@ -98,13 +100,7 @@ export default class FaqsWebPart extends BaseClientSideWebPart<IFaqsWebPartProps
     }
   }
 
-  private detectmob(): boolean {
-    if(window.innerWidth <= 480) {
-      return true;
-    } else {
-      return false;
-    }
-  }
+
 
   protected onDispose(): void {
     ReactDom.unmountComponentAtNode(this.domElement);
@@ -114,25 +110,6 @@ export default class FaqsWebPart extends BaseClientSideWebPart<IFaqsWebPartProps
     return Version.parse('1.0');
   }
 
-  /**
-   * @function
-   * Generates a GUID
-   */
-  private getGuid(): string {
-    return this.s4() + this.s4() + '-' + this.s4() + '-' + this.s4() + '-' +
-      this.s4() + '-' + this.s4() + this.s4() + this.s4();
-  }
-
-  /**
-   * @function
-   * Generates a GUID part
-   */
-  private s4(): string {
-      return Math.floor((1 + Math.random()) * 0x10000)
-        .toString(16)
-        .substring(1);
-  }
-
   //executes only before property pane is loaded.
   protected async loadPropertyPaneResources(): Promise<void> {
     // import additional controls/components