TODO done and simpler handler call.