updated structure, outline