added extra arrows and loops