Introduction.- Present motivations to look again to the shock fitting technique.- Spurious behavior of shock-capturing methods by the fractional step approach in problems containing stiff source terms and discontinuities.- LES simulations of flows with strong shocks by shock-capturing schemes.- The Moretti visionary the upwinding schemes and their contribution to the modern CFD methods.- Thoughts and Afterthoughts about shock computations.- Evolution of the Moretti's from Boundary shock-fitting, to lambda-scheme, to Floating shock-fitting.- Shock-fitting calculations on three dimensional domains.- Steady and unsteady shock interactions and limitations of the Shock Fitting approach.- Basic elements of unstructured results achieved and future developments.- Shock-fitting implementation in the VKI solver "CoolFluid", Development of a shock-fitting version for cell centered solver (Finite volume).- Shock-fitting implementation in the INRIA solver NEO.- Unsteady computations (shock-vortex interaction), comparison between shock-capturing and shock-fitting computations.- An Unsteady shock-fitting technique based on unstructured moving shocks.- Shock detection based on the theory of characteristics.- Inserting a surface into an existing unstructured mesh.