Removing Billy's changes