updated to work against trunk