code cleanup.
add analysis2,3