added more stuff to analyze