No return null any more in the code