Updated from google docs