hopefully made everything faster