Added alandaguegreene's dynamic visibility classes