updated kass handling