adding support for live environment