Merging Bradley's changes