jtong - huge improve, we won't run gen on development environment now