tweaked for runtime deployment