diff --git a/app/build.gradle b/app/build.gradle
index c4ad3945..f674ee7c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,6 +29,6 @@ dependencies {
     compile 'com.google.android.gms:play-services-vision:10.2.0'
     compile 'com.jakewharton:butterknife:8.4.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
-    // TODO (1): Add Timber dependency
+    compile 'com.jakewharton.timber:timber:4.5.0'
     testCompile 'junit:junit:4.12'
 }
diff --git a/app/src/main/java/com/example/android/emojify/Emojifier.java b/app/src/main/java/com/example/android/emojify/Emojifier.java
index 97cd01d5..a0c1d2d1 100644
--- a/app/src/main/java/com/example/android/emojify/Emojifier.java
+++ b/app/src/main/java/com/example/android/emojify/Emojifier.java
@@ -20,7 +20,6 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
-import android.util.Log;
 import android.util.SparseArray;
 import android.widget.Toast;
 
@@ -28,10 +27,10 @@
 import com.google.android.gms.vision.face.Face;
 import com.google.android.gms.vision.face.FaceDetector;
 
+import timber.log.Timber;
+
 class Emojifier {
 
-    // TODO (3): Change all Log statements to Timber logs and remove the LOG_TAG variable
-    private static final String LOG_TAG = Emojifier.class.getSimpleName();
 
     private static final float EMOJI_SCALE_FACTOR = .9f;
     private static final double SMILING_PROB_THRESHOLD = .15;
@@ -59,7 +58,7 @@ static Bitmap detectFacesandOverlayEmoji(Context context, Bitmap picture) {
         SparseArray<Face> faces = detector.detect(frame);
 
         // Log the number of faces
-        Log.d(LOG_TAG, "detectFaces: number of faces = " + faces.size());
+        Timber.d("detectFaces: number of faces = " + faces.size());
 
         // Initialize result bitmap to original picture
         Bitmap resultBitmap = picture;
@@ -134,10 +133,10 @@ static Bitmap detectFacesandOverlayEmoji(Context context, Bitmap picture) {
 
     private static Emoji whichEmoji(Face face) {
         // Log all the probabilities
-        Log.d(LOG_TAG, "whichEmoji: smilingProb = " + face.getIsSmilingProbability());
-        Log.d(LOG_TAG, "whichEmoji: leftEyeOpenProb = "
+        Timber.d("whichEmoji: smilingProb = " + face.getIsSmilingProbability());
+        Timber.d("whichEmoji: leftEyeOpenProb = "
                 + face.getIsLeftEyeOpenProbability());
-        Log.d(LOG_TAG, "whichEmoji: rightEyeOpenProb = "
+        Timber.d("whichEmoji: rightEyeOpenProb = "
                 + face.getIsRightEyeOpenProbability());
 
 
@@ -173,8 +172,9 @@ private static Emoji whichEmoji(Face face) {
 
 
         // Log the chosen Emoji
-        Log.d(LOG_TAG, "whichEmoji: " + emoji.name());
-
+        Timber.d("whichEmoji: " + emoji.name());
+        
+        // return the chosen Emoji
         return emoji;
     }
 
diff --git a/app/src/main/java/com/example/android/emojify/MainActivity.java b/app/src/main/java/com/example/android/emojify/MainActivity.java
index 5beec22f..be311a78 100644
--- a/app/src/main/java/com/example/android/emojify/MainActivity.java
+++ b/app/src/main/java/com/example/android/emojify/MainActivity.java
@@ -42,6 +42,7 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import timber.log.Timber;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -73,7 +74,8 @@ protected void onCreate(Bundle savedInstanceState) {
         // Bind the views
         ButterKnife.bind(this);
 
-        // TODO (2): Set up Timber
+        // Set up Timber
+        Timber.plant(new Timber.DebugTree());
     }
 
     /**
@@ -181,7 +183,7 @@ private void processAndSetImage() {
 
         // Resample the saved image to fit the ImageView
         mResultsBitmap = BitmapUtils.resamplePic(this, mTempPhotoPath);
-        
+
 
         // Detect the faces and overlay the appropriate emoji
         mResultsBitmap = Emojifier.detectFacesandOverlayEmoji(this, mResultsBitmap);
@@ -191,7 +193,6 @@ private void processAndSetImage() {
     }
 
 
-
     /**
      * OnClick method for the save button.
      */