improved filed handling