change some methods non-final, non perf sensitive