v 2.3 finally working (as far as I can tell!)