Overhaul of our vendor for kitkat