Some adjustments to make it actually work