updated to Chris s newer outline