mjr refactor fx prod