updating some usages