changes from fri 3 Oct 2014