merging kias changes