Refatoring of FOX