Adding conditional for default setting