Updated from_* files