Updated to simplify master.