working on before_map