Updated for waffling.