Finalize code changes for 26/11/2013