Final Commit 16/08/2013