KHANAAS stuff added.