perf. improvements