tweaks to try to loop better