Added logic for production vs dev