added if check