pulled in updates from FAD