More edits, using new fol macro