[FFC] Richard Snider's Additions