The school of economics that developed the free-market ideas of classical economics into a full-scale model of how an economy works. The best-known neo-classical economist was Alfred Marshall, the father of marginal analysis. Neo-classical thinking, which mostly assumes that markets tend towards equilibrium, was attacked by Keynes and became unfashionable during the Keynesian-dominated decades after the Second World War. But, thanks to economists such as Milton Friedman, many neo-classical ideas have since become widely accepted and uncontroversial.