added if0
before refactor