Blown up and fixed. Refactory history completed