Splitting into 2 helpers the single one