Updated with no-ceros