Small changes to make it actually work