added isProd check