(should be addressed more widespread as part of ethan's scale work)