fixing looping and yoyo