edited cached stuff