changed f mapping