Merging in alex's changes