Final Commit 14/11/2014