Changed strategy to a manager instead of listener