fixed dynamic issue.  need major organization.