Fixes, I think it's working