diff --git a/EZAudioExamples/OSX/EZAudioPlayFileExample/EZAudioPlayFileExample/PlayFileViewController.m b/EZAudioExamples/OSX/EZAudioPlayFileExample/EZAudioPlayFileExample/PlayFileViewController.m
index f33d90a..4f97e10 100644
--- a/EZAudioExamples/OSX/EZAudioPlayFileExample/EZAudioPlayFileExample/PlayFileViewController.m
+++ b/EZAudioExamples/OSX/EZAudioPlayFileExample/EZAudioPlayFileExample/PlayFileViewController.m
@@ -181,13 +181,13 @@
 #pragma mark - EZAudioFileDelegate
 -(void)audioFile:(EZAudioFile *)audioFile readAudio:(float **)buffer withBufferSize:(UInt32)bufferSize withNumberOfChannels:(UInt32)numberOfChannels {
   if( [EZOutput sharedOutput].isPlaying ){
-    if( self.audioPlot.plotType == EZPlotTypeBuffer  &&
-        self.audioPlot.shouldFill == YES              &&
-        self.audioPlot.shouldMirror == YES ){
-      self.audioPlot.shouldFill = NO;
-      self.audioPlot.shouldMirror = NO;
-    }
     dispatch_async(dispatch_get_main_queue(), ^{
+      if( self.audioPlot.plotType     == EZPlotTypeBuffer &&
+         self.audioPlot.shouldFill   == YES              &&
+         self.audioPlot.shouldMirror == YES ){
+        self.audioPlot.shouldFill = NO;
+        self.audioPlot.shouldMirror = NO;
+      }
       [self.audioPlot updateBuffer:buffer[0] withBufferSize:bufferSize];
     });
   }
diff --git a/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample.xcodeproj/project.pbxproj b/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample.xcodeproj/project.pbxproj
index 74e1751..046655e 100644
--- a/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample.xcodeproj/project.pbxproj
+++ b/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample.xcodeproj/project.pbxproj
@@ -26,6 +26,7 @@
 		94056E70185BB42100EB94BA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94056E6F185BB42100EB94BA /* QuartzCore.framework */; };
 		94056E74185BB44200EB94BA /* RecordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 94056E72185BB44200EB94BA /* RecordViewController.m */; };
 		94056E75185BB44200EB94BA /* RecordViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 94056E73185BB44200EB94BA /* RecordViewController.xib */; };
+		941D71AA186298AA007D52D8 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 941D71A9186298AA007D52D8 /* AVFoundation.framework */; };
 		944D07B5186049E80076EF7A /* AEFloatConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 944D0699186049E70076EF7A /* AEFloatConverter.m */; };
 		944D07B6186049E80076EF7A /* TPCircularBuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 944D069A186049E70076EF7A /* TPCircularBuffer.c */; };
 		944D07B7186049E80076EF7A /* EZAudioFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 944D069E186049E70076EF7A /* EZAudioFile.m */; };
@@ -79,6 +80,7 @@
 		94056E71185BB44200EB94BA /* RecordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecordViewController.h; sourceTree = "<group>"; };
 		94056E72185BB44200EB94BA /* RecordViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RecordViewController.m; sourceTree = "<group>"; };
 		94056E73185BB44200EB94BA /* RecordViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RecordViewController.xib; sourceTree = "<group>"; };
+		941D71A9186298AA007D52D8 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
 		944D0698186049E70076EF7A /* AEFloatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AEFloatConverter.h; sourceTree = "<group>"; };
 		944D0699186049E70076EF7A /* AEFloatConverter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AEFloatConverter.m; sourceTree = "<group>"; };
 		944D069A186049E70076EF7A /* TPCircularBuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TPCircularBuffer.c; sourceTree = "<group>"; };
@@ -109,6 +111,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				941D71AA186298AA007D52D8 /* AVFoundation.framework in Frameworks */,
 				94056E70185BB42100EB94BA /* QuartzCore.framework in Frameworks */,
 				94056E6E185BB41900EB94BA /* CoreAudio.framework in Frameworks */,
 				94056E6B185BB40F00EB94BA /* AudioToolbox.framework in Frameworks */,
@@ -153,6 +156,7 @@
 		94056E0B185BB3D800EB94BA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				941D71A9186298AA007D52D8 /* AVFoundation.framework */,
 				94056E6F185BB42100EB94BA /* QuartzCore.framework */,
 				94056E6D185BB41900EB94BA /* CoreAudio.framework */,
 				94056E69185BB40F00EB94BA /* AudioToolbox.framework */,
diff --git a/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.h b/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.h
index 4d43357..d033d3e 100644
--- a/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.h
+++ b/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.h
@@ -28,13 +28,16 @@
 // Import EZAudio header
 #import "EZAudio.h"
 
+// Import AVFoundation to play the file (will save EZAudioFile and EZOutput for separate example)
+#import <AVFoundation/AVFoundation.h>
+
 // By default this will record a file to /Users/YOUR_USERNAME/Documents/test.caf
 #define kAudioFilePath [NSString stringWithFormat:@"%@%@",NSHomeDirectory(),@"/Documents/test.caf"]
 
 /**
  We will allow this view controller to act as an EZMicrophoneDelegate. This is how we listen for the microphone callback.
  */
-@interface RecordViewController : NSViewController <EZMicrophoneDelegate>
+@interface RecordViewController : NSViewController <EZMicrophoneDelegate,AVAudioPlayerDelegate>
 
 /**
  Use a OpenGL based plot to visualize the data coming in
@@ -57,6 +60,11 @@
 @property (nonatomic,strong) EZRecorder *recorder;
 
 #pragma mark - Actions
+/**
+ Stops the recorder and starts playing whatever has been recorded.
+ */
+-(IBAction)playFile:(id)sender;
+
 /**
  Toggles the microphone on and off. When the microphone is on it will send its delegate (aka this view controller) the audio data in various ways (check out the EZMicrophoneDelegate documentation for more details);
  */
diff --git a/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.m b/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.m
index fcab673..b103e7f 100644
--- a/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.m
+++ b/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.m
@@ -25,15 +25,23 @@
 
 #import "RecordViewController.h"
 
-@interface RecordViewController ()
-
+@interface RecordViewController (){
+  BOOL _hasSomethingToPlay;
+}
+@property (nonatomic,strong) AVAudioPlayer *audioPlayer;
+@property (nonatomic,weak) IBOutlet NSButton *microphoneToggle;
+@property (nonatomic,weak) IBOutlet NSButton *playButton;
+@property (nonatomic,weak) IBOutlet NSButton *recordingToggle;
 @end
 
 @implementation RecordViewController
+@synthesize audioPlayer;
 @synthesize audioPlot;
 @synthesize isRecording;
 @synthesize microphone;
+@synthesize microphoneToggle;
 @synthesize recorder;
+@synthesize recordingToggle;
 
 #pragma mark - Initialization
 -(id)init {
@@ -77,7 +85,14 @@
   // Waveform color
   self.audioPlot.color           = [NSColor colorWithCalibratedRed: 0.114 green: 0.346 blue: 0.685 alpha: 1];
   // Plot type
-  self.audioPlot.plotType        = EZPlotTypeBuffer;
+  self.audioPlot.plotType        = EZPlotTypeRolling;
+  // Fill
+  self.audioPlot.shouldFill      = YES;
+  // Mirror
+  self.audioPlot.shouldMirror    = YES;
+  
+  // Configure the play button
+  [self.playButton setHidden:YES];
   
   /*
    Start the microphone
@@ -87,6 +102,32 @@
 }
 
 #pragma mark - Actions
+-(void)playFile:(id)sender {
+  
+  // Update microphone state
+  [self.microphone stopFetchingAudio];
+  self.microphoneToggle.state = NSOffState;
+  [self.microphoneToggle setEnabled:NO];
+  
+  // Update recording state
+  self.isRecording = NO;
+  self.recordingToggle.state = NSOffState;
+  [self.recordingToggle setEnabled:NO];
+  
+  // Create Audio Player
+  if( self.audioPlayer ){
+    if( self.audioPlayer.playing ) [self.audioPlayer stop];
+    self.audioPlayer = nil;
+  }
+  NSError *err;
+  self.audioPlayer = [[AVAudioPlayer alloc] initWithContentsOfURL:[NSURL fileURLWithPath:kAudioFilePath]
+                                                            error:&err];
+  
+  [self.audioPlayer play];
+  self.audioPlayer.delegate = self;
+  
+}
+
 -(void)toggleMicrophone:(id)sender {
   switch([sender state]){
     case NSOffState:
@@ -101,6 +142,7 @@
 }
 
 -(void)toggleRecording:(id)sender {
+  [self.playButton setHidden:NO];
   self.isRecording = (BOOL)[sender state];
 }
 
@@ -145,4 +187,20 @@ withNumberOfChannels:(UInt32)numberOfChannels {
   
 }
 
+#pragma mark - AVAudioPlayerDelegate
+/*
+ Occurs when the audio player instance completes playback
+ */
+-(void)audioPlayerDidFinishPlaying:(AVAudioPlayer *)player successfully:(BOOL)flag {
+  // Update microphone state
+  self.microphoneToggle.state = NSOnState;
+  [self.microphoneToggle setEnabled:YES];
+  [self.microphone startFetchingAudio];
+  
+  // Update recording state
+  self.isRecording = NO;
+  self.recordingToggle.state = NSOffState;
+  [self.recordingToggle setEnabled:YES];
+}
+
 @end
diff --git a/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.xib b/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.xib
index 4f3351a..c01a642 100644
--- a/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.xib
+++ b/EZAudioExamples/OSX/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.xib
@@ -8,6 +8,9 @@
         <customObject id="-2" userLabel="File's Owner" customClass="RecordViewController">
             <connections>
                 <outlet property="audioPlot" destination="dEs-hA-819" id="iGa-BH-xLn"/>
+                <outlet property="microphoneToggle" destination="642-4u-aBm" id="FYB-Cp-aPB"/>
+                <outlet property="playButton" destination="y4R-NE-icG" id="1FP-aQ-BcB"/>
+                <outlet property="recordingToggle" destination="fdr-L4-Y6i" id="dYX-uf-6YS"/>
                 <outlet property="view" destination="178-e9-GIn" id="bPz-Je-f18"/>
             </connections>
         </customObject>
@@ -46,15 +49,29 @@
                         <action selector="toggleRecording:" target="-2" id="WKw-uD-CBI"/>
                     </connections>
                 </button>
+                <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="y4R-NE-icG">
+                    <rect key="frame" x="137" y="6" width="65" height="32"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <buttonCell key="cell" type="push" title="Play" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XoV-qX-N9x">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="playFile:" target="-2" id="jrd-yg-pvq"/>
+                    </connections>
+                </button>
             </subviews>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="642-4u-aBm" secondAttribute="bottom" constant="16" id="LIb-Ej-46s"/>
                 <constraint firstAttribute="bottom" secondItem="fdr-L4-Y6i" secondAttribute="bottom" constant="16" id="Pvr-gh-o7q"/>
                 <constraint firstItem="642-4u-aBm" firstAttribute="top" secondItem="dEs-hA-819" secondAttribute="bottom" constant="12" id="QgB-Ty-AN0"/>
+                <constraint firstAttribute="bottom" secondItem="y4R-NE-icG" secondAttribute="bottom" constant="13" id="UX6-ts-w3M"/>
+                <constraint firstItem="y4R-NE-icG" firstAttribute="leading" secondItem="642-4u-aBm" secondAttribute="trailing" constant="8" id="ZbS-5O-fFJ"/>
                 <constraint firstItem="642-4u-aBm" firstAttribute="leading" secondItem="178-e9-GIn" secondAttribute="leading" constant="20" id="ayr-0v-aOC"/>
                 <constraint firstAttribute="trailing" secondItem="fdr-L4-Y6i" secondAttribute="trailing" constant="20" id="hk9-I9-9g5"/>
                 <constraint firstItem="dEs-hA-819" firstAttribute="top" secondItem="178-e9-GIn" secondAttribute="top" id="mv6-AK-Cz4"/>
                 <constraint firstAttribute="trailing" secondItem="dEs-hA-819" secondAttribute="trailing" id="tqk-1H-SZ4"/>
+                <constraint firstItem="y4R-NE-icG" firstAttribute="top" secondItem="dEs-hA-819" secondAttribute="bottom" constant="8" id="xzp-cM-xAL"/>
                 <constraint firstItem="dEs-hA-819" firstAttribute="leading" secondItem="178-e9-GIn" secondAttribute="leading" id="yvm-d3-Fzl"/>
             </constraints>
         </customView>
diff --git a/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/Base.lproj/Main_iPad.storyboard b/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/Base.lproj/Main_iPad.storyboard
index 3f774a7..c6fb4b6 100644
--- a/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/Base.lproj/Main_iPad.storyboard
+++ b/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/Base.lproj/Main_iPad.storyboard
@@ -15,8 +15,76 @@
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
                         <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IfI-AX-Mxa" customClass="EZAudioPlotGL">
+                                <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                <subviews>
+                                    <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="V4v-rc-ou0">
+                                        <rect key="frame" x="635" y="974" width="113" height="30"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <segments>
+                                            <segment title="Buffer"/>
+                                            <segment title="Rolling"/>
+                                        </segments>
+                                        <connections>
+                                            <action selector="changePlotType:" destination="BYZ-38-t0r" eventType="valueChanged" id="Gar-Fq-3Ct"/>
+                                        </connections>
+                                    </segmentedControl>
+                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dEw-zi-hw0">
+                                        <rect key="frame" x="20" y="943" width="728" height="21"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xt0-OL-u2c">
+                                        <rect key="frame" x="20" y="974" width="30" height="30"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <state key="normal" title="Play">
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="play:" destination="BYZ-38-t0r" eventType="touchUpInside" id="1V6-g2-0vG"/>
+                                        </connections>
+                                    </button>
+                                    <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" continuous="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BeD-bR-Pie">
+                                        <rect key="frame" x="18" y="902" width="732" height="34"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <connections>
+                                            <action selector="seekToFrame:" destination="BYZ-38-t0r" eventType="valueChanged" id="FLM-Zv-iCG"/>
+                                        </connections>
+                                    </slider>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="bottom" secondItem="V4v-rc-ou0" secondAttribute="bottom" constant="21" id="2OX-ym-8rb"/>
+                                    <constraint firstAttribute="trailing" secondItem="V4v-rc-ou0" secondAttribute="trailing" constant="20" id="2k1-WE-mad"/>
+                                    <constraint firstItem="V4v-rc-ou0" firstAttribute="top" secondItem="dEw-zi-hw0" secondAttribute="bottom" constant="10" id="4Dm-f1-hVC"/>
+                                    <constraint firstItem="dEw-zi-hw0" firstAttribute="top" secondItem="BeD-bR-Pie" secondAttribute="bottom" constant="8" id="8eR-tY-zbU"/>
+                                    <constraint firstItem="BeD-bR-Pie" firstAttribute="leading" secondItem="IfI-AX-Mxa" secondAttribute="leading" constant="20" id="USg-gd-N1o"/>
+                                    <constraint firstAttribute="trailing" secondItem="BeD-bR-Pie" secondAttribute="trailing" constant="20" id="ZWC-YN-Bod"/>
+                                    <constraint firstItem="xt0-OL-u2c" firstAttribute="leading" secondItem="IfI-AX-Mxa" secondAttribute="leading" constant="20" id="kMA-uY-yt9"/>
+                                    <constraint firstAttribute="trailing" secondItem="dEw-zi-hw0" secondAttribute="trailing" constant="20" id="nAI-3T-La6"/>
+                                    <constraint firstAttribute="bottom" secondItem="xt0-OL-u2c" secondAttribute="bottom" constant="20" id="rkU-j7-Ud0"/>
+                                    <constraint firstItem="dEw-zi-hw0" firstAttribute="leading" secondItem="IfI-AX-Mxa" secondAttribute="leading" constant="20" id="vUv-3d-NJ2"/>
+                                    <constraint firstItem="xt0-OL-u2c" firstAttribute="top" secondItem="dEw-zi-hw0" secondAttribute="bottom" constant="10" id="wz8-bv-vFP"/>
+                                </constraints>
+                            </view>
+                        </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="IfI-AX-Mxa" secondAttribute="trailing" id="0uO-Ml-VnN"/>
+                            <constraint firstAttribute="bottom" secondItem="IfI-AX-Mxa" secondAttribute="bottom" id="D5n-3z-VGt"/>
+                            <constraint firstItem="IfI-AX-Mxa" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" id="K35-CT-vej"/>
+                            <constraint firstItem="IfI-AX-Mxa" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="VJz-7E-nDX"/>
+                        </constraints>
                     </view>
+                    <connections>
+                        <outlet property="audioPlot" destination="IfI-AX-Mxa" id="Mit-Lw-6eO"/>
+                        <outlet property="filePathLabel" destination="dEw-zi-hw0" id="Uir-R0-Wum"/>
+                        <outlet property="framePositionSlider" destination="BeD-bR-Pie" id="7Fl-k0-tre"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
diff --git a/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/PlayFileViewController.m b/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/PlayFileViewController.m
index a93ea3b..f1d799c 100644
--- a/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/PlayFileViewController.m
+++ b/EZAudioExamples/iOS/EZAudioPlayFileExample/EZAudioPlayFileExample/PlayFileViewController.m
@@ -154,9 +154,17 @@
        readAudio:(float **)buffer
   withBufferSize:(UInt32)bufferSize
 withNumberOfChannels:(UInt32)numberOfChannels {
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self.audioPlot updateBuffer:buffer[0] withBufferSize:bufferSize];
-  });
+  if( [EZOutput sharedOutput].isPlaying ){
+    dispatch_async(dispatch_get_main_queue(), ^{
+      if( self.audioPlot.plotType     == EZPlotTypeBuffer &&
+         self.audioPlot.shouldFill   == YES              &&
+         self.audioPlot.shouldMirror == YES ){
+        self.audioPlot.shouldFill = NO;
+        self.audioPlot.shouldMirror = NO;
+      }
+      [self.audioPlot updateBuffer:buffer[0] withBufferSize:bufferSize];
+    });
+  }
 }
 
 -(void)audioFile:(EZAudioFile *)audioFile
diff --git a/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.m b/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.m
index 19565fb..f244183 100644
--- a/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.m
+++ b/EZAudioExamples/iOS/EZAudioRecordExample/EZAudioRecordExample/RecordViewController.m
@@ -80,6 +80,9 @@
   self.recordingTextField.text = @"Not Recording";
   self.playingTextField.text = @"Not Playing";
   
+  // Hide the play button
+  self.playButton.hidden = YES;
+  
   /*
    Log out where the file is being written to within the app's documents directory
    */
@@ -139,6 +142,7 @@
     if( self.audioPlayer.playing ) [self.audioPlayer stop];
     self.audioPlayer = nil;
   }
+  self.playButton.hidden = NO;
   
   self.isRecording = (BOOL)[sender isOn];
   self.recordingTextField.text = self.isRecording ? @"Recording" : @"Not Recording";