adding changes to prevent live from blowing up