To do - return value check