Shoud be working now

After some more testing