Aaron's changes to fix UPS rating