attempting perf. improvements