merging kav's updates