Update from hard-drive of changes done at work on 26/2/13