Now using auto where I saw it suitable