converted yo arc, removed extra code