Works after class extraction