Some edits from a while back...
Merging...