updated algebra and analysis