updated Movement to Strategy-Pattern