Reworked content, added UPSU logo to chip
Merge-o merge