probably merge fallout. will address