Start to remove the Discipline part... We may come back with alternative approach.