added environments, simplified views