Final commit 13/1/2013