[SD-1253] Re-factored the new function