Martin's changes April-Oct 2013