Attempts to fix major problems