Code

* reverted to rev 17 as it really needs fuse 2.5