Artash some changes