modified fon forked branch