renamed some var