My changes. Should be working now.
This can't be tested I guess...