renamed some vars