updates for Flex