support for both dev and non-dev