Hopefully this fixes everything. Might be done :)