PMO-2838: refactored to resuse exisiting code
PMO-2838: refactored to resuse exisiting code