added khuno
some changes