This paper shows extracts from the development process of a lean-burn gaseous fuelled engine for combined heat and power generation. The aim was to optimize the mixture formation, the charge motion and the combustion of an existing multi-cylinder engine. Therefore, experimental investigations on a single cylinder research engine and numerical simulations based on 3-dimensional CFD methods were carried out.The use of CFD methods for the optimization of the engine required intensive development efforts in the field of combustion simulation. In particular, the combustion model developed by Magnussen and Hjertager  was modified. Through comparison with the PDF model and results of the engine process calculation, the suitability of this modified combustion model was shown. In addition, a knock model was also developed and implemented in the CFD code in order to determine the knock tendency of different engine concepts.