work on some disagreements
double checked piotrs disagreements