Updated for new website and added some memory efficiency