fixed attribution, removed junk code