Final updates for clarity