changing RAnalInfos to RAnalState
fixed up usage of new for switch