Merges brady's changes