Changed return code and path