Further amends/additions.