changes to strategies
some conflicts