added if for Public