Refactored chaff