Added great method

Signed-off-by: Developer A
Merge with Developer A changes