Updated source and models to fix the unfair sweeping