cleaned up code. Fixed universal pads