amended, left in extra comments