Fixed a slow thing but it's still a bit broken