Changed default yes/no