general updates for clarity