Added AvoidingStrategy; Improvements in strategy changing