Merging in fabian's changes