consolidating and renaming for clarity