small speedups, but kinda removed arbritrary size