attempt at more constness