Made it actually work properly.