Changed to pointer parameters when non-const