Changes some if's to switch

still no object data streams on the go..