Updated for non ceros