Should this also be updated for the same pattern where its used in the V1 systems controller?