Attempting to address CPM scoping issues.