Hopefully made things faster