some changes in var names