FSW with Tim's mods to deliver to NASA