Latest changes in schematics and code