updated fpds loader to be smarter