reintroduced const where applicable