measure performance
add files back, refactor code to be more clear