Update FoN logic, fix Haromm's