refactoring, made pw end callable without springbattle (without replay) for timeouts