Re-Commit from post laptop crash