Added some changes for Kirill.