Finished rev1 layout