Now it works (kinda)