modify with_scheme