added some speed stuff, need more