Changed return type
Tested