More parameter adjustemens as if I don't have anything better to do