#164 part of code revised, constant arguments set to "const"