added label, removed unused codes