Fixed defaults, added conditional.