Tweaked full analysis to make it a little more efficient