small changes to return value