little fr update (need some more work)