fixed call to aroundFor() that was causing bug, restructured