changed names and update comments