tweaking usd class, etc.