more changes on master trunk