hopefully this should speed stuff up