Slight modifications to OldMan
Resolved a minor merge conflict.