Added function + test
Function + test