* renamed some vars