added requested changes of Thorsten