bring in changes from ku

thanks for the contribution