added changes of Stefan again