modified fon forked branch

a change from a forking.