some changes to analysis base