improve override