Changed to remove some hard-coded stuff