Made changes to be consistant with changes to kano-toolset