I also found the original waffle style knee pads (Rukka Armas) to be very uncomfortable. I ordered the upgrade/replacement Rukka D30 Air Knee Pads. D30 worked specifically with Rukka when they developed the armor. Besides it being more comfortable than the standard armor, it provides greater levels of protection. It blows away the D30 armor in my Klim Badlands Pro pants. I picked mine up for $45 and I have been very pleased.