Some optimization to bumper, needs more work.