some changes to coding