Simplified the site tremendously