Design-2 : did minor changes regarding the label manipulation