Attibution, some minor changes