updated layout and schematics