stop hardcoding imports, improve timing perf