reorganizing clash stuff