strategies refactor, edgecases III