Schematics Updates

Recommendations from Andy