Name change!
Fix zero count and move to bol