Added Rose's changes