Added safe mode