Feature/zero checks