The comments i added to the other changeset i believe do apply to this one too