restructuring based on Andy's draft