Added zero and unitonly feature