Not tested since refactoring! (January 2017)