changed keys to use env settings