Made flash fields more general