Version 0.9.9.9.6.1

More work