Added first draft of Alec's changes.