kanav's changes