Make it actually work properly