some conflicts. had to backup my code, accept with "tc" and introduce my own code again. Hope I didnt leave anything out.