Updated a rough outline