Logic Update
Minor cleanup.
Merge branch 'Ar' into david3