HashSet -> ArrayList for the Schematics.
Merge remote-tracking branch 'origin/master'