Becareful with shadowing attrs
Removed unnecessary code
Fixed way to merge the stuff