some changes for Namalsk 0.73