diff --git a/exe/FeatureExtraction/FeatureExtraction.cpp b/exe/FeatureExtraction/FeatureExtraction.cpp
index a2e64f9..a6c147e 100644
--- a/exe/FeatureExtraction/FeatureExtraction.cpp
+++ b/exe/FeatureExtraction/FeatureExtraction.cpp
@@ -300,7 +300,7 @@ int main (int argc, char **argv)
 	vector<string> output_similarity_align;
 	vector<string> output_hog_align_files;
 
-	double sim_scale = 0.7;
+	double sim_scale = -1;
 	int sim_size = 112;
 	bool grayscale = false;	
 	bool video_output = false;
@@ -320,6 +320,7 @@ int main (int argc, char **argv)
 	get_output_feature_params(output_similarity_align, output_hog_align_files, sim_scale, sim_size, grayscale, verbose, dynamic,
 		output_2D_landmarks, output_3D_landmarks, output_model_params, output_pose, output_AUs, output_gaze, arguments);
 	
+
 	// Used for image masking
 
 	string tri_loc;
@@ -339,11 +340,6 @@ int main (int argc, char **argv)
 		}
 	}	
 
-	// Will warp to scaled mean shape
-	cv::Mat_<double> similarity_normalised_shape = face_model.pdm.mean_shape * sim_scale;
-	// Discard the z component
-	similarity_normalised_shape = similarity_normalised_shape(cv::Rect(0, 0, 1, 2*similarity_normalised_shape.rows/3)).clone();
-
 	// If multiple video files are tracked, use this to indicate if we are done
 	bool done = false;	
 	int f_n = -1;
@@ -381,7 +377,11 @@ int main (int argc, char **argv)
 	}	
 
 	// Creating a  face analyser that will be used for AU extraction
-	FaceAnalysis::FaceAnalyser face_analyser(vector<cv::Vec3d>(), 0.7, 112, 112, au_loc, tri_loc);
+
+	// Make sure sim_scale is proportional to sim_size if not set
+	if (sim_scale == -1) sim_scale = sim_size * (0.7 / 112.0);
+
+	FaceAnalysis::FaceAnalyser face_analyser(vector<cv::Vec3d>(), sim_scale, sim_size, sim_size, au_loc, tri_loc);
 		
 	while(!done) // this is not a for loop as we might also be reading from a webcam
 	{
@@ -588,7 +588,7 @@ int main (int argc, char **argv)
 				}
 				if(hog_output_file.is_open())
 				{
-					FaceAnalysis::Extract_FHOG_descriptor(hog_descriptor, sim_warped_img, num_hog_rows, num_hog_cols);						
+					face_analyser.GetLatestHOG(hog_descriptor, num_hog_rows, num_hog_cols);
 
 					if(visualise_hog && !det_parameters.quiet_mode)
 					{
diff --git a/gui/OpenFaceDemo/MainWindow.xaml.cs b/gui/OpenFaceDemo/MainWindow.xaml.cs
index a73e78c..d198234 100644
--- a/gui/OpenFaceDemo/MainWindow.xaml.cs
+++ b/gui/OpenFaceDemo/MainWindow.xaml.cs
@@ -88,7 +88,7 @@ namespace OpenFaceDemo
 
             clnf_params = new FaceModelParameters(root, true);
             clnf_model = new CLNF(clnf_params);
-            face_analyser = new FaceAnalyserManaged(root, true);
+            face_analyser = new FaceAnalyserManaged(root, true, 112);
 
             Dispatcher.Invoke(DispatcherPriority.Render, new TimeSpan(0, 0, 0, 0, 200), (Action)(() =>
             {
diff --git a/gui/OpenFaceOffline/MainWindow.xaml b/gui/OpenFaceOffline/MainWindow.xaml
index 9049955..09d6dcb 100644
--- a/gui/OpenFaceOffline/MainWindow.xaml
+++ b/gui/OpenFaceOffline/MainWindow.xaml
@@ -29,7 +29,7 @@
                 <MenuItem Header="Open image sequence" Click="imageSequenceFileOpenClick">
                 </MenuItem>
             </MenuItem>
-            <MenuItem Name="RecordingMenu"  Header="Recording settings">
+            <MenuItem Name="RecordingMenu"  Header="Record">
                 <MenuItem Header="Set Location"></MenuItem>
                 <MenuItem Name="RecordAUCheckBox" IsCheckable="True" Header="Record AUs" Click="recordCheckBox_click"></MenuItem>
                 <MenuItem Name="RecordPoseCheckBox" IsCheckable="True" Header="Record pose" Click="recordCheckBox_click"></MenuItem>
@@ -41,6 +41,10 @@
                 <MenuItem Name="RecordAlignedCheckBox" IsCheckable="True" Header="Record aligned faces" Click="recordCheckBox_click"></MenuItem>
                 <MenuItem Name="RecordTrackedVidCheckBox" IsCheckable="True" Header="Record tracked video" Click="recordCheckBox_click"></MenuItem>
             </MenuItem>
+            <MenuItem Name="SettingsMenu"  Header="Recording settings">
+                <MenuItem Header="Set output location..."></MenuItem>
+                <MenuItem Header="Set output image size..." Click="setOutputImageSize_Click"></MenuItem>
+            </MenuItem>
             <MenuItem Header="AU settings">
                 <MenuItem Name="UseDynamicModelsCheckBox" IsChecked="True" IsCheckable="True" Header="Use dynamic models" Click="UseDynamicModelsCheckBox_Click"></MenuItem>
                 <MenuItem Name="UseDynamicShiftingCheckBox" IsCheckable="True" Header="Use dynamic shifting" Click="UseDynamicModelsCheckBox_Click"></MenuItem>
diff --git a/gui/OpenFaceOffline/MainWindow.xaml.cs b/gui/OpenFaceOffline/MainWindow.xaml.cs
index f1c0182..9d53758 100644
--- a/gui/OpenFaceOffline/MainWindow.xaml.cs
+++ b/gui/OpenFaceOffline/MainWindow.xaml.cs
@@ -148,6 +148,8 @@ namespace OpenFaceOffline
         bool show_geometry = true;
         bool show_aus = true;
 
+        int image_output_size = 112;
+
         // TODO classifiers converted to regressors
 
         // TODO indication that track is done        
@@ -166,7 +168,7 @@ namespace OpenFaceOffline
         bool dynamic_AU_shift = true;
         bool dynamic_AU_scale = false;
         bool use_dynamic_models = true;
-        
+
         public MainWindow()
         {
             InitializeComponent();
@@ -196,7 +198,7 @@ namespace OpenFaceOffline
 
             clnf_params = new FaceModelParameters(root, false);
             clnf_model = new CLNF(clnf_params);
-            face_analyser = new FaceAnalyserManaged(root, use_dynamic_models);
+            face_analyser = new FaceAnalyserManaged(root, use_dynamic_models, image_output_size);
 
         }
 
@@ -234,7 +236,7 @@ namespace OpenFaceOffline
                         // Prepare recording if any based on the directory
                         String file_no_ext = System.IO.Path.GetDirectoryName(filenames[0]);
                         file_no_ext = System.IO.Path.GetFileName(file_no_ext);
-                        
+
                         SetupRecording(record_root, file_no_ext, capture.width, capture.height, record_2D_landmarks, record_2D_landmarks, record_model_params, record_pose, record_AUs, record_gaze);
 
                         // Start the actual processing                        
@@ -304,7 +306,7 @@ namespace OpenFaceOffline
                         {
                             // Prepare recording if any
                             String file_no_ext = System.IO.Path.GetFileNameWithoutExtension(filename);
-                            
+
                             SetupRecording(record_root, file_no_ext, capture.width, capture.height, record_2D_landmarks, record_3D_landmarks, record_model_params, record_pose, record_AUs, record_gaze);
 
                             // Start the actual processing                        
@@ -445,7 +447,7 @@ namespace OpenFaceOffline
                 //////////////////////////////////////////////
                 RawImage frame = null;
                 double progress = -1;
-                
+
                 frame = new RawImage(capture.GetNextFrame(false));
                 progress = capture.GetProgress();
 
@@ -505,7 +507,7 @@ namespace OpenFaceOffline
                 List<Tuple<double, double>> landmarks = null;
                 List<Tuple<double, double>> eye_landmarks = null;
                 List<Tuple<Point, Point>> gaze_lines = null;
-                Tuple<double, double> gaze_angle = new Tuple<double, double>(0,0);
+                Tuple<double, double> gaze_angle = new Tuple<double, double>(0, 0);
 
                 if (detectionSucceeding)
                 {
@@ -556,7 +558,7 @@ namespace OpenFaceOffline
                         nonRigidGraph.Update(non_rigid_params);
 
                         // Update eye gaze
-                        GazeXLabel.Content = gaze_angle.Item1 * (180.0/ Math.PI);
+                        GazeXLabel.Content = gaze_angle.Item1 * (180.0 / Math.PI);
                         GazeYLabel.Content = gaze_angle.Item2 * (180.0 / Math.PI);
 
                     }
@@ -625,7 +627,7 @@ namespace OpenFaceOffline
                 }));
 
                 // Recording the tracked model
-                RecordFrame(clnf_model, detectionSucceeding, frame_id + 1, frame, grayFrame, ((double)frame_id)/fps,
+                RecordFrame(clnf_model, detectionSucceeding, frame_id + 1, frame, grayFrame, ((double)frame_id) / fps,
                     record_2D_landmarks, record_2D_landmarks, record_model_params, record_pose, record_AUs, record_gaze, fx, fy, cx, cy);
 
                 if (reset)
@@ -694,7 +696,7 @@ namespace OpenFaceOffline
         // ----------------------------------------------------------
         // Recording helpers (TODO simplify)
 
-        private void SetupRecording(String root, String filename, int width, int height, bool output_2D_landmarks, bool output_3D_landmarks, 
+        private void SetupRecording(String root, String filename, int width, int height, bool output_2D_landmarks, bool output_3D_landmarks,
                                     bool output_model_params, bool output_pose, bool output_AUs, bool output_gaze)
         {
             // Disallow changing recording settings when the recording starts, TODO move this up a bit
@@ -810,7 +812,7 @@ namespace OpenFaceOffline
 
             if (record_tracked_vid)
                 face_analyser.StopTrackingRecording();
-            
+
             Dispatcher.Invoke(DispatcherPriority.Render, new TimeSpan(0, 0, 0, 0, 200), (Action)(() =>
             {
                 RecordingMenu.IsEnabled = true;
@@ -834,7 +836,7 @@ namespace OpenFaceOffline
 
             List<double> pose = new List<double>();
             clnf_model.GetPose(pose, fx, fy, cx, cy);
-            
+
             output_features_file.Write(String.Format("{0}, {1}, {2:F3}, {3}", frame_ind, time_stamp, confidence, success ? 1 : 0));
 
             if (output_gaze)
@@ -852,7 +854,7 @@ namespace OpenFaceOffline
             if (output_2D_landmarks)
             {
                 List<Tuple<double, double>> landmarks_2d = clnf_model.CalculateLandmarks();
-                
+
                 for (int i = 0; i < landmarks_2d.Count; ++i)
                     output_features_file.Write(", {0:F2}", landmarks_2d[i].Item1);
 
@@ -863,7 +865,7 @@ namespace OpenFaceOffline
             if (output_3D_landmarks)
             {
                 List<System.Windows.Media.Media3D.Point3D> landmarks_3d = clnf_model.Calculate3DLandmarks(fx, fy, cx, cy);
-                
+
                 for (int i = 0; i < landmarks_3d.Count; ++i)
                     output_features_file.Write(", {0:F2}", landmarks_3d[i].X);
 
@@ -892,8 +894,8 @@ namespace OpenFaceOffline
                 var au_classes = face_analyser.GetCurrentAUsClass();
 
                 foreach (var name_class in au_class_names)
-                    output_features_file.Write(", {0:F0}", au_classes[name_class]);                
-                
+                    output_features_file.Write(", {0:F0}", au_classes[name_class]);
+
             }
 
             output_features_file.WriteLine();
@@ -1206,10 +1208,26 @@ namespace OpenFaceOffline
             {
                 // Change the face analyser, this should be safe as the model is only allowed to change when not running
                 String root = AppDomain.CurrentDomain.BaseDirectory;
-                face_analyser = new FaceAnalyserManaged(root, UseDynamicModelsCheckBox.IsChecked);
+                face_analyser = new FaceAnalyserManaged(root, UseDynamicModelsCheckBox.IsChecked, image_output_size);
             }
             use_dynamic_models = UseDynamicModelsCheckBox.IsChecked;
         }
 
+        private void setOutputImageSize_Click(object sender, RoutedEventArgs e)
+        {
+
+            NumberEntryWindow number_entry_window = new NumberEntryWindow();
+            number_entry_window.Icon = this.Icon;
+
+            number_entry_window.WindowStartupLocation = WindowStartupLocation.CenterScreen;
+
+            if (number_entry_window.ShowDialog() == true)
+            {
+                image_output_size = number_entry_window.OutputInt;
+                String root = AppDomain.CurrentDomain.BaseDirectory;
+                face_analyser = new FaceAnalyserManaged(root, use_dynamic_models, image_output_size);
+
+            }
+        }
     }
 }
diff --git a/gui/OpenFaceOffline/OpenFaceOffline.csproj b/gui/OpenFaceOffline/OpenFaceOffline.csproj
index f66b34d..1e0cd55 100644
--- a/gui/OpenFaceOffline/OpenFaceOffline.csproj
+++ b/gui/OpenFaceOffline/OpenFaceOffline.csproj
@@ -91,6 +91,9 @@
     <Compile Include="UI_items\MultiBarGraphHorz.xaml.cs">
       <DependentUpon>MultiBarGraphHorz.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UI_items\NumberEntryWindow.xaml.cs">
+      <DependentUpon>NumberEntryWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UI_items\OverlayImage.xaml.cs">
       <DependentUpon>OverlayImage.xaml</DependentUpon>
     </Compile>
@@ -125,6 +128,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UI_items\NumberEntryWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="UI_items\OverlayImage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/gui/OpenFaceOffline/UI_items/NumberEntryWindow.xaml b/gui/OpenFaceOffline/UI_items/NumberEntryWindow.xaml
new file mode 100644
index 0000000..a9736f5
--- /dev/null
+++ b/gui/OpenFaceOffline/UI_items/NumberEntryWindow.xaml
@@ -0,0 +1,17 @@
+<Window x:Class="OpenFaceOffline.NumberEntryWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="NumberEntryWindow" Height="160" Width="300">
+    <Grid>
+        <StackPanel FocusManager.FocusedElement="{Binding ElementName=ResponseTextBox}">
+            <TextBlock HorizontalAlignment="Center" Text="Enter new output image size" FontSize="20"/>
+            <TextBox Margin="0,4,0,0" x:Name="ResponseTextBox" FontSize="20" Width="120" TextChanged="ResponseTextBox_TextChanged" />
+            <Label Name="warningLabel" Visibility="Collapsed" FontStyle="Italic" Foreground="Red" HorizontalAlignment="Center">Has to be a non negative integer</Label>
+
+            <Button Margin="0,8,0,0" Content="OK" Click="OKButton_Click" Width="100" VerticalAlignment="Bottom"/>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/gui/OpenFaceOffline/UI_items/NumberEntryWindow.xaml.cs b/gui/OpenFaceOffline/UI_items/NumberEntryWindow.xaml.cs
new file mode 100644
index 0000000..a7d4ea1
--- /dev/null
+++ b/gui/OpenFaceOffline/UI_items/NumberEntryWindow.xaml.cs
@@ -0,0 +1,142 @@
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2016, Carnegie Mellon University and University of Cambridge,
+// all rights reserved.
+//
+// THIS SOFTWARE IS PROVIDED “AS IS” FOR ACADEMIC USE ONLY AND ANY EXPRESS
+// OR IMPLIED WARRANTIES WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY.
+// OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Notwithstanding the license granted herein, Licensee acknowledges that certain components
+// of the Software may be covered by so-called “open source” software licenses (“Open Source
+// Components”), which means any software licenses approved as open source licenses by the
+// Open Source Initiative or any substantially similar licenses, including without limitation any
+// license that, as a condition of distribution of the software licensed under such license,
+// requires that the distributor make the software available in source code format. Licensor shall
+// provide a list of Open Source Components for a particular version of the Software upon
+// Licensee’s request. Licensee will comply with the applicable terms of such licenses and to
+// the extent required by the licenses covering Open Source Components, the terms of such
+// licenses will apply in lieu of the terms of this Agreement. To the extent the terms of the
+// licenses applicable to Open Source Components prohibit any of the restrictions in this
+// License Agreement with respect to such Open Source Component, such restrictions will not
+// apply to such Open Source Component. To the extent the terms of the licenses applicable to
+// Open Source Components require Licensor to make an offer to provide source code or
+// related information in connection with the Software, such offer is hereby made. Any request
+// for source code or related information should be directed to cl-face-tracker-distribution@lists.cam.ac.uk
+// Licensee acknowledges receipt of notices for the Open Source Components for the initial
+// delivery of the Software.
+
+//     * Any publications arising from the use of this software, including but
+//       not limited to academic journal and conference publications, technical
+//       reports and manuals, must cite at least one of the following works:
+//
+//       OpenFace: an open source facial behavior analysis toolkit
+//       Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency
+//       in IEEE Winter Conference on Applications of Computer Vision, 2016  
+//
+//       Rendering of Eyes for Eye-Shape Registration and Gaze Estimation
+//       Erroll Wood, Tadas Baltrušaitis, Xucong Zhang, Yusuke Sugano, Peter Robinson, and Andreas Bulling 
+//       in IEEE International. Conference on Computer Vision (ICCV),  2015 
+//
+//       Cross-dataset learning and person-speci?c normalisation for automatic Action Unit detection
+//       Tadas Baltrušaitis, Marwa Mahmoud, and Peter Robinson 
+//       in Facial Expression Recognition and Analysis Challenge, 
+//       IEEE International Conference on Automatic Face and Gesture Recognition, 2015 
+//
+//       Constrained Local Neural Fields for robust facial landmark detection in the wild.
+//       Tadas Baltrušaitis, Peter Robinson, and Louis-Philippe Morency. 
+//       in IEEE Int. Conference on Computer Vision Workshops, 300 Faces in-the-Wild Challenge, 2013.    
+//
+///////////////////////////////////////////////////////////////////////////////
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace OpenFaceOffline
+{
+    /// <summary>
+    /// Interaction logic for TextEntryWindow.xaml
+    /// </summary>
+    public partial class NumberEntryWindow : Window
+    {
+        public NumberEntryWindow()
+        {
+            InitializeComponent();
+            ResponseTextBox.Text = "112";
+            OutputInt = 112;
+            this.KeyDown += new KeyEventHandler(TextEntry_KeyDown);
+
+        }
+
+        private string ResponseText
+        {
+            get { return ResponseTextBox.Text; }
+            set { ResponseTextBox.Text = value; }
+        }
+
+        public int OutputInt;
+
+        private void OKButton_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            DialogResult = true;
+        }
+
+        private void TextEntry_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+            {
+                DialogResult = true;
+            }
+        }
+
+        // Do not allow illegal characters like
+        private void ResponseTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+
+            try
+            {
+                OutputInt = Int32.Parse(ResponseTextBox.Text);
+                if(OutputInt > 0)
+                { 
+                    warningLabel.Visibility = System.Windows.Visibility.Collapsed;
+                }
+                else
+                {
+                    warningLabel.Visibility = System.Windows.Visibility.Visible;
+                    OutputInt = 112;
+                    ResponseTextBox.Text = "112";
+                    ResponseTextBox.SelectionStart = ResponseTextBox.Text.Length;
+
+                }
+            }
+            catch (FormatException except)
+            {
+                OutputInt = 112;
+                ResponseTextBox.Text = "112";
+                ResponseTextBox.SelectionStart = ResponseTextBox.Text.Length;
+                warningLabel.Visibility = System.Windows.Visibility.Visible;
+            }
+
+        }
+
+    }
+}
diff --git a/lib/local/CppInerop/FaceAnalyserInterop.h b/lib/local/CppInerop/FaceAnalyserInterop.h
index a6c618b..4742cda 100644
--- a/lib/local/CppInerop/FaceAnalyserInterop.h
+++ b/lib/local/CppInerop/FaceAnalyserInterop.h
@@ -133,15 +133,17 @@ private:
 
 public:
 
-	FaceAnalyserManaged(System::String^ root, bool dynamic) 
+	FaceAnalyserManaged(System::String^ root, bool dynamic, int output_width) 
 	{
 			
 		vector<cv::Vec3d> orientation_bins;
 		orientation_bins.push_back(cv::Vec3d(0,0,0));
-		double scale = 0.7;
-		int width = 112;
-		int height = 112;
+
+		int width = output_width;
+		int height = output_width;
 		
+		double scale = width * (0.7 / 112.0);
+
 		string root_std = msclr::interop::marshal_as<std::string>(root);
 		
 		// TODO diff paths and locations for the demo mode
@@ -265,7 +267,7 @@ public:
 		face_analyser->GetLatestHOG(*hog_features, *num_rows, *num_cols);
 		
 		face_analyser->GetLatestAlignedFace(*aligned_face);
-
+		
 		*good_frame = clnf->clnf->detection_success;
 
 		if(vis_hog)
diff --git a/lib/local/FaceAnalyser/include/FaceAnalyser.h b/lib/local/FaceAnalyser/include/FaceAnalyser.h
index e5bd9f8..c9df566 100644
--- a/lib/local/FaceAnalyser/include/FaceAnalyser.h
+++ b/lib/local/FaceAnalyser/include/FaceAnalyser.h
@@ -111,13 +111,9 @@ public:
 	void GetLatestNeutralHOG(cv::Mat_<double>& hog_descriptor, int& num_rows, int& num_cols);
 	
 	cv::Mat_<int> GetTriangulation();
-
-	cv::Mat_<uchar> GetLatestAlignedFaceGrayscale();
 	
 	void GetGeomDescriptor(cv::Mat_<double>& geom_desc);
 
-	void ExtractCurrentMedians(vector<cv::Mat>& hog_medians, vector<cv::Mat>& face_image_medians, vector<cv::Vec3d>& orientations);
-
 	// Grab the names of AUs being predicted
 	std::vector<std::string> GetAUClassNames() const; // Presence
 	std::vector<std::string> GetAURegNames() const; // Intensity
@@ -148,8 +144,8 @@ private:
 	int frames_tracking;
 
 	// Cache of intermediate images
-	cv::Mat_<uchar> aligned_face_grayscale;
-	cv::Mat aligned_face;
+	cv::Mat aligned_face_for_au;
+	cv::Mat aligned_face_for_output;
 	cv::Mat hog_descriptor_visualisation;
 
 	// Private members to be used for predictions
diff --git a/lib/local/FaceAnalyser/src/FaceAnalyser.cpp b/lib/local/FaceAnalyser/src/FaceAnalyser.cpp
index ae26d73..c75be7f 100644
--- a/lib/local/FaceAnalyser/src/FaceAnalyser.cpp
+++ b/lib/local/FaceAnalyser/src/FaceAnalyser.cpp
@@ -226,7 +226,7 @@ void FaceAnalyser::GetLatestHOG(cv::Mat_<double>& hog_descriptor, int& num_rows,
 
 void FaceAnalyser::GetLatestAlignedFace(cv::Mat& image)
 {
-	image = this->aligned_face.clone();
+	image = this->aligned_face_for_output.clone();
 }
 
 void FaceAnalyser::GetLatestNeutralHOG(cv::Mat_<double>& hog_descriptor, int& num_rows, int& num_cols)
@@ -267,50 +267,15 @@ int GetViewId(const vector<cv::Vec3d> orientations_all, const cv::Vec3d& orienta
 	
 }
 
-void FaceAnalyser::ExtractCurrentMedians(vector<cv::Mat>& hog_medians, vector<cv::Mat>& face_image_medians, vector<cv::Vec3d>& orientations)
-{
-
-	orientations = this->head_orientations;
-
-	for(size_t i = 0; i < orientations.size(); ++i)
-	{
-		cv::Mat_<double> median_face(this->face_image_median.rows, this->face_image_median.cols, 0.0);
-		cv::Mat_<double> median_hog(this->hog_desc_median.rows, this->hog_desc_median.cols, 0.0);
-
-		ExtractMedian(this->face_image_hist[i], this->face_image_hist_sum[i], median_face, 256, 0, 255);		
-		ExtractMedian(this->hog_desc_hist[i], this->hog_hist_sum[i], median_hog, this->num_bins_hog, 0, 1);
-
-		// Add the HOG sample
-		hog_medians.push_back(median_hog.clone());
-
-		// For the face image need to convert it to suitable format
-		cv::Mat_<uchar> aligned_face_cols_uchar;
-		median_face.convertTo(aligned_face_cols_uchar, CV_8U);
-
-		cv::Mat aligned_face_uchar;
-		if(aligned_face.channels() == 1)
-		{
-			aligned_face_uchar = cv::Mat(aligned_face.rows, aligned_face.cols, CV_8U, aligned_face_cols_uchar.data);
-		}
-		else
-		{
-			aligned_face_uchar = cv::Mat(aligned_face.rows, aligned_face.cols, CV_8UC3, aligned_face_cols_uchar.data);
-		}
-
-		face_image_medians.push_back(aligned_face_uchar.clone());
-		
-	}
-}
-
 std::pair<std::vector<std::pair<string, double>>, std::vector<std::pair<string, double>>> FaceAnalyser::PredictStaticAUs(const cv::Mat& frame, const LandmarkDetector::CLNF& clnf, bool visualise)
 {
 	
 	// First align the face
-	AlignFaceMask(aligned_face, frame, clnf, triangulation, true, align_scale, align_width, align_height);
+	AlignFaceMask(aligned_face_for_au, frame, clnf, triangulation, true, 0.7, 112, 112);
 	
 	// Extract HOG descriptor from the frame and convert it to a useable format
 	cv::Mat_<double> hog_descriptor;
-	Extract_FHOG_descriptor(hog_descriptor, aligned_face, this->num_hog_rows, this->num_hog_cols);
+	Extract_FHOG_descriptor(hog_descriptor, aligned_face_for_au, this->num_hog_rows, this->num_hog_cols);
 
 	// Store the descriptor
 	hog_desc_frame = hog_descriptor;
@@ -326,10 +291,10 @@ std::pair<std::vector<std::pair<string, double>>, std::vector<std::pair<string,
 
 	cv::hconcat(locs.t(), geom_descriptor_frame.clone(), geom_descriptor_frame);
 	
-	// First convert the face image to double representation as a row vector
-	cv::Mat_<uchar> aligned_face_cols(1, aligned_face.cols * aligned_face.rows * aligned_face.channels(), aligned_face.data, 1);
-	cv::Mat_<double> aligned_face_cols_double;
-	aligned_face_cols.convertTo(aligned_face_cols_double, CV_64F);
+	// First convert the face image to double representation as a row vector, TODO rem
+	//cv::Mat_<uchar> aligned_face_cols(1, aligned_face_for_au.cols * aligned_face_for_au.rows * aligned_face_for_au.channels(), aligned_face_for_au.data, 1);
+	//cv::Mat_<double> aligned_face_cols_double;
+	//aligned_face_cols.convertTo(aligned_face_cols_double, CV_64F);
 
 	// Visualising the median HOG
 	if (visualise)
@@ -363,26 +328,31 @@ void FaceAnalyser::AddNextFrame(const cv::Mat& frame, const LandmarkDetector::CL
 	// First align the face if tracking was successfull
 	if(clnf_model.detection_success)
 	{
-		AlignFaceMask(aligned_face, frame, clnf_model, triangulation, true, align_scale, align_width, align_height);
-	}
-	else
-	{
-		aligned_face = cv::Mat(align_height, align_width, CV_8UC3);
-		aligned_face.setTo(0);
-	}
 
-	if(aligned_face.channels() == 3)
-	{
-		cv::cvtColor(aligned_face, aligned_face_grayscale, CV_BGR2GRAY);
+		// The aligned face requirement for AUs
+		AlignFaceMask(aligned_face_for_au, frame, clnf_model, triangulation, true, 0.7, 112, 112);
+
+		// If the output requirement matches use the already computed one, else compute it again
+		if(align_scale == 0.7 && align_width == 112 && align_height == 112)
+		{
+			aligned_face_for_output = aligned_face_for_au.clone();
+		}
+		else
+		{
+			AlignFaceMask(aligned_face_for_output, frame, clnf_model, triangulation, true, align_scale, align_width, align_height);
+		}
 	}
 	else
 	{
-		aligned_face_grayscale = aligned_face.clone();
+		aligned_face_for_output = cv::Mat(align_height, align_width, CV_8UC3);
+		aligned_face_for_au = cv::Mat(112, 112, CV_8UC3);
+		aligned_face_for_output.setTo(0);
+		aligned_face_for_au.setTo(0);
 	}
 
 	// Extract HOG descriptor from the frame and convert it to a useable format
 	cv::Mat_<double> hog_descriptor;
-	Extract_FHOG_descriptor(hog_descriptor, aligned_face, this->num_hog_rows, this->num_hog_cols);
+	Extract_FHOG_descriptor(hog_descriptor, aligned_face_for_au, this->num_hog_rows, this->num_hog_cols);
 	
 	// Store the descriptor
 	hog_desc_frame = hog_descriptor;
@@ -450,14 +420,11 @@ void FaceAnalyser::AddNextFrame(const cv::Mat& frame, const LandmarkDetector::CL
 		UpdateRunningMedian(this->geom_desc_hist, this->geom_hist_sum, this->geom_descriptor_median, geom_descriptor_frame, update_median, this->num_bins_geom, this->min_val_geom, this->max_val_geom);
 	}
 
-	// First convert the face image to double representation as a row vector
-	cv::Mat_<uchar> aligned_face_cols(1, aligned_face.cols * aligned_face.rows * aligned_face.channels(), aligned_face.data, 1);
-	cv::Mat_<double> aligned_face_cols_double;
-	aligned_face_cols.convertTo(aligned_face_cols_double, CV_64F);
+	// First convert the face image to double representation as a row vector, TODO rem?
+	//cv::Mat_<uchar> aligned_face_cols(1, aligned_face.cols * aligned_face.rows * aligned_face.channels(), aligned_face.data, 1);
+	//cv::Mat_<double> aligned_face_cols_double;
+	//aligned_face_cols.convertTo(aligned_face_cols_double, CV_64F);
 	
-	// TODO get rid of this completely as it takes too long?
-	//UpdateRunningMedian(this->face_image_hist[orientation_to_use], this->face_image_hist_sum[orientation_to_use], this->face_image_median, aligned_face_cols_double, update_median, 256, 0, 255);
-
 	// Visualising the median HOG
 	if(visualise)
 	{
@@ -1097,12 +1064,6 @@ vector<pair<string, double>> FaceAnalyser::PredictCurrentAUsClass(int view)
 	return predictions;
 }
 
-
-cv::Mat_<uchar> FaceAnalyser::GetLatestAlignedFaceGrayscale()
-{
-	return aligned_face_grayscale.clone();
-}
-
 cv::Mat FaceAnalyser::GetLatestHOGDescriptorVisualisation()
 {
 	return hog_descriptor_visualisation;
diff --git a/matlab_runners/Action Unit Experiments/run_AU_prediction_BP4D.m b/matlab_runners/Action Unit Experiments/run_AU_prediction_BP4D.m
index de807b6..c45df63 100644
--- a/matlab_runners/Action Unit Experiments/run_AU_prediction_BP4D.m	
+++ b/matlab_runners/Action Unit Experiments/run_AU_prediction_BP4D.m	
@@ -125,6 +125,8 @@ end
 
 %%
 f = fopen('results/BP4D_valid_res_class.txt', 'w');
+f1s_class = zeros(1, numel(aus_BP4D));
+
 for au = 1:numel(aus_BP4D)
 
     if(inds_au_class(au) ~= 0)
@@ -137,7 +139,7 @@ for au = 1:numel(aus_BP4D)
         recall = tp./(tp+fn);
 
         f1 = 2 * precision .* recall ./ (precision + recall);
-
+        f1s_class(au) = f1;
         fprintf(f, 'AU%d class, Precision - %.3f, Recall - %.3f, F1 - %.3f\n', aus_BP4D(au), precision, recall, f1);
     end    
     
@@ -195,8 +197,10 @@ end
 
 %%
 f = fopen('results/BP4D_valid_res_int.txt', 'w');
+ints_cccs = zeros(1, numel(aus_BP4D));
 for au = 1:numel(aus_BP4D)
     [ accuracies, F1s, corrs, ccc, rms, classes ] = evaluate_au_prediction_results( preds_all_int(valid_ids, inds_au_int(au)), labels_gt(valid_ids,au));
+    ints_cccs(au) = ccc;
     fprintf(f, 'AU%d results - rms %.3f, corr %.3f, ccc - %.3f\n', aus_BP4D(au), rms, corrs, ccc);    
 end
 fclose(f);
\ No newline at end of file
diff --git a/matlab_runners/Action Unit Experiments/run_AU_prediction_Bosphorus.m b/matlab_runners/Action Unit Experiments/run_AU_prediction_Bosphorus.m
index fff14c5..90e51bc 100644
--- a/matlab_runners/Action Unit Experiments/run_AU_prediction_Bosphorus.m	
+++ b/matlab_runners/Action Unit Experiments/run_AU_prediction_Bosphorus.m	
@@ -100,6 +100,7 @@ end
 f = fopen('results/Bosphorus_res_class.txt', 'w');
 labels_gt_bin = labels_gt;
 labels_gt_bin(labels_gt_bin > 1) = 1;
+f1s_class = zeros(1, numel(aus_Bosph));
 for au = 1:numel(aus_Bosph)
   
     tp = sum(labels_gt_bin(:,au) == 1 & labels_pred(:, au) == 1);
@@ -111,6 +112,7 @@ for au = 1:numel(aus_Bosph)
     recall = tp./(tp+fn);
 
     f1 = 2 * precision .* recall ./ (precision + recall);
+    f1s_class(au) = f1;
 
     fprintf(f, 'AU%d class, Precision - %.3f, Recall - %.3f, F1 - %.3f\n', aus_Bosph(au), precision, recall, f1);
 
@@ -180,10 +182,13 @@ end
 
 %%
 f = fopen('results/Bosphorus_res_int.txt', 'w');
+cccs_reg = zeros(1, numel(aus_Bosph));
 for au = 1:numel(aus_Bosph)
   
     [ ~, ~, corrs, ccc, rms, ~ ] = evaluate_regression_results( labels_pred(:, au), labels_gt(:, au));
     
+    cccs_reg(au) = ccc;
+    
     fprintf(f, 'AU%d intensity, Corr - %.3f, RMS - %.3f, CCC - %.3f\n', aus_Bosph(au), corrs, rms, ccc);
 
 end
diff --git a/matlab_runners/Action Unit Experiments/run_AU_prediction_UNBC.m b/matlab_runners/Action Unit Experiments/run_AU_prediction_UNBC.m
index 9e71ae3..8738b13 100644
--- a/matlab_runners/Action Unit Experiments/run_AU_prediction_UNBC.m	
+++ b/matlab_runners/Action Unit Experiments/run_AU_prediction_UNBC.m	
@@ -98,10 +98,11 @@ end
 
 %%
 f = fopen('results/UNBC_valid_res_int.txt', 'w');
+ints_cccs = zeros(1, numel(aus_UNBC);
 for au = 1:numel(aus_UNBC)
     
     [ accuracies, F1s, corrs, ccc, rms, classes ] = evaluate_au_prediction_results( preds_all_int(:, inds_au_int(au)), labels_gt(:,au));
     fprintf(f, 'AU%d results - rms %.3f, corr %.3f, ccc - %.3f\n', aus_UNBC(au), rms, corrs, ccc);  
-    
+    ints_cccs(au) = ccc;
 end
 fclose(f);
\ No newline at end of file
diff --git a/matlab_runners/Demos/feature_extraction_demo_vid.m b/matlab_runners/Demos/feature_extraction_demo_vid.m
index 8c8b5d4..ec679f4 100644
--- a/matlab_runners/Demos/feature_extraction_demo_vid.m
+++ b/matlab_runners/Demos/feature_extraction_demo_vid.m
@@ -36,7 +36,7 @@ for i=1:numel(in_files)
     output_shape_params = [output name '.params.txt'];
     
     command = cat(2, command, [' -f "' inputFile '" -of "' outputFile '"']);        
-    command = cat(2, command, [' -simalign "' outputDir_aligned '" -hogalign "' outputHOG_aligned '"' ]);    
+    command = cat(2, command, [' -simsize 224 -simalign "' outputDir_aligned '" -hogalign "' outputHOG_aligned '"' ]);    
                  
 end
 
@@ -153,7 +153,7 @@ hold off;
 [hog_data, valid_inds, vid_id] = Read_HOG_files({name}, output);
 
 %% Output aligned images
-img_files = dir([outputDir_aligned, '/*.png']);
+img_files = dir([outputDir_aligned, '/*.bmp']);
 imgs = cell(numel(img_files, 1));
 for i=1:numel(img_files)
    imgs{i} = imread([ outputDir_aligned, '/', img_files(i).name]);
diff --git a/matlab_runners/Full_test_suite.m b/matlab_runners/Full_test_suite.m
index 29cbbe6..9291465 100644
--- a/matlab_runners/Full_test_suite.m
+++ b/matlab_runners/Full_test_suite.m
@@ -21,6 +21,17 @@ cd('../');
 
 %% AUs
 cd('Action Unit Experiments');
+run_AU_prediction_Bosphorus
+assert(mean(cccs_reg) > 0.56);
+assert(mean(f1s_class) > 0.46);
+
+run_AU_prediction_BP4D
+assert(mean(ints_cccs) > 0.6);
+assert(mean(f1s_class) > 0.6);
+
+run_AU_prediction_UNBC
+assert(mean(ints_cccs) > 0.38);
+
 run_AU_prediction_DISFA
 assert(mean(au_res) > 0.7);