Add Kimberly's speed-ups