Fix attempt
Finally works
Fix everything