Reuse exising function in the prev. commit