Beaver tweaks
now it loops